merge
authorKeir Fraser <keir@xen.org>
Thu, 14 Jul 2011 08:33:02 +0000 (09:33 +0100)
committerKeir Fraser <keir@xen.org>
Thu, 14 Jul 2011 08:33:02 +0000 (09:33 +0100)

Trivial merge